From: Keir Fraser <keir.fraser@citrix.com>
Date: Fri, 16 Oct 2009 07:36:22 +0000 (+0100)
Subject: xm: Use 'vifname' config option to construct a qemu tap name.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~13212
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22?a=commitdiff_plain;h=5a0730a43591dddd413d0f1b72ef5aa37997d60e;p=xen.git

xm: Use 'vifname' config option to construct a qemu tap name.

Signed-off-by: Jim Fehlig <jfehlig@novell.com>
---

diff --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py
index faf12eabce..d6127bfb93 100644
--- a/tools/python/xen/xend/image.py
+++ b/tools/python/xen/xend/image.py
@@ -873,9 +873,14 @@ class HVMImageHandler(ImageHandler):
             ret.append("-net")
             ret.append("nic,vlan=%d,macaddr=%s,model=%s" %
                        (nics, mac, model))
+            vifname = devinfo.get('vifname')
+            if vifname:
+                vifname = "tap-" + vifname
+            else:
+                vifname = "tap%d.%d" % (self.vm.getDomid(), nics-1)
             ret.append("-net")
-            ret.append("tap,vlan=%d,ifname=tap%d.%d,bridge=%s" %
-                       (nics, self.vm.getDomid(), nics-1, bridge))
+            ret.append("tap,vlan=%d,ifname=%s,bridge=%s" %
+                       (nics, vifname, bridge))
 
         if nics == 0:
             ret.append("-net")